Improved inputs